Update
authorAnton Gladky <gladk@debian.org>
Sun, 8 Nov 2020 19:46:26 +0000 (20:46 +0100)
committerAnton Gladky <gladk@debian.org>
Sun, 8 Nov 2020 19:46:26 +0000 (20:46 +0100)
14 files changed:
debian/control
debian/copyright
debian/libvtk9-dev.lintian-overrides [new file with mode: 0644]
debian/libvtk9-java.lintian-overrides [new file with mode: 0644]
debian/libvtk9-qt-dev.install [new file with mode: 0644]
debian/libvtk9-qt.install [new file with mode: 0644]
debian/libvtk9-qt.lintian-overrides [new file with mode: 0644]
debian/libvtk9.lintian-overrides [new file with mode: 0644]
debian/patches/fix_path_perl.patch [new file with mode: 0644]
debian/patches/libharu_version.patch [deleted file]
debian/patches/pyth
debian/patches/series
debian/patches/vtk9python [new file with mode: 0644]
debian/rules

index 1e2291af5658db094a25e6f044eb2e30c8083f27..06f7185d0a9f2895ea229aacfede74db0d36c633 100644 (file)
@@ -160,6 +160,7 @@ Architecture: any
 Section: java
 Depends: ${java:Depends},
          ${misc:Depends},
+         ${python3:Depends},
          ${shlibs:Depends}
 Suggests: java-virtual-machine,
           libvtk9-dev (= ${binary:Version}),
@@ -238,3 +239,33 @@ Description: VTK examples
  for 3D computer graphics, image processing, and visualization.
  .
  This package provides examples for VTK9
+
+Package: libvtk9-qt
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: VTK libraries, Qt files
+ The Visualization Toolkit (VTK) is an open-source software system
+ for 3D computer graphics, image processing, and visualization.
+ .
+ This package provides the shared libraries needed to run C++ programs
+ that use VTK. Qt files
+
+Package: libvtk9-qt-dev
+Architecture: any
+Section: libdevel
+Depends: libvtk9-dev (= ${binary:Version}),
+         libvtk9-qt (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+         qtbase5-dev,
+         qttools5-private-dev,
+         libqt5opengl5-dev,
+         libqt5webkit5-dev
+Description: VTK header files, containing Qt files
+ The Visualization Toolkit (VTK) is an open-source software system
+ for 3D computer graphics, image processing, and visualization.
+ .
+ This package provides the VTK header files required to compile
+ C++ programs that use VTK to do 3D visualisation. Qt files
index 3eb63e1a118abe422cba32dc26ceef281b438388..28edc9ce2f3fe6848350b9116bfd98e41f3132fc 100644 (file)
@@ -21,7 +21,7 @@ Files-Excluded:
   ThirdParty/tiff/vtktiff
   ThirdParty/zlib/vtkzlib
   ThirdParty/glew/vtkglew
-  ThirdParty/utf8
+  ThirdParty/utf8/vtkutf8
   ThirdParty/AutobahnPython
   ThirdParty/SixPython
   ThirdParty/ZopeInterface
@@ -51,14 +51,6 @@ License: Sandia-2004+BSD-3-clause
  or without modification, are permitted provided that this Notice and any
  statement of authorship are reproduced on all copies.
 
-Files: Examples/GUI/Qt/SimpleView/SimpleView.cxx
- Examples/GUI/Qt/SimpleView/main.cxx
-Copyright: 2007 Sandia Corporation
-License: Sandia-2007
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that this Notice and any
- statement of authorship are reproduced on all copies.
-
 Files: Examples/Statistics/*.cxx
 Copyright: 2008 Sandia Corporation
 License: Sandia-2008
diff --git a/debian/libvtk9-dev.lintian-overrides b/debian/libvtk9-dev.lintian-overrides
new file mode 100644 (file)
index 0000000..592f051
--- /dev/null
@@ -0,0 +1 @@
+libvtk9-dev: script-not-executable
diff --git a/debian/libvtk9-java.lintian-overrides b/debian/libvtk9-java.lintian-overrides
new file mode 100644 (file)
index 0000000..0195b37
--- /dev/null
@@ -0,0 +1 @@
+libvtk9-java: shared-library-lacks-prerequisites
diff --git a/debian/libvtk9-qt-dev.install b/debian/libvtk9-qt-dev.install
new file mode 100644 (file)
index 0000000..0be394a
--- /dev/null
@@ -0,0 +1,4 @@
+# remove Python files here and privide a symlink in the python package 
+# usr/lib/*/python2.7/site-packages/vtk/*Qt*
+usr/lib/*/*Qt*.so
+usr/include/vtk-9.0/*Qt*
diff --git a/debian/libvtk9-qt.install b/debian/libvtk9-qt.install
new file mode 100644 (file)
index 0000000..4c7a2dd
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/*/*Qt*.so.*
diff --git a/debian/libvtk9-qt.lintian-overrides b/debian/libvtk9-qt.lintian-overrides
new file mode 100644 (file)
index 0000000..5c59554
--- /dev/null
@@ -0,0 +1 @@
+libvtk9-qt: package-name-doesnt-match-sonames
diff --git a/debian/libvtk9.lintian-overrides b/debian/libvtk9.lintian-overrides
new file mode 100644 (file)
index 0000000..85c26f1
--- /dev/null
@@ -0,0 +1 @@
+libvtk9: package-name-doesnt-match-sonames
diff --git a/debian/patches/fix_path_perl.patch b/debian/patches/fix_path_perl.patch
new file mode 100644 (file)
index 0000000..9759d54
--- /dev/null
@@ -0,0 +1,95 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vtk9 (9.0.1+dfsg1-1) UNRELEASED; urgency=medium
+ .
+   [ Gert Wollny ]
+   * Initial release. (Closes: #XXXXXX)
+ .
+   [ Drew Parsons ]
+   * Thanks: Nico Schloemer, Johannes Schauer and Gert for initial work
+     and python3 packaging.
+   * Drop deprecated patches:
+      10_allpatches.patch
+      40_use_system_sqlite.patch
+       - VTK_USE_SYSTEM_SQLITE now available
+      60_use_system_mpi4py.patch
+       - handled by VTK_USE_SYSTEM_MPI4PY
+      80_fix_arm_compilation.patch
+       - Qt5 now builds on arm
+      107_gl2ps_1.4.0.patch
+      109_use_parallel_hdf5.patch
+      111_search_multiarch_paths_for_libproj.patch
+ .
+   [ Nico Schlömer ]
+   * Update to 8.2.0
+   * remove obsolete patches, configure options
+   * rework utf-8 patch
+   * Update standard to 4.4.1 (no changes)
+Author: Johannes Schauer <josch@debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2020-11-08
+
+--- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_class2example.pl
++++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_class2example.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ # Time-stamp: <2004-06-09 11:12:38 barre>
+ #
+ # Build cross-references between classes and examples
+--- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_cleanhtml.pl
++++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_cleanhtml.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ # Time-stamp: <2002-10-25 20:17:59 barre>
+ #
+ # Clean the HTML generated by Doxygen to remove some layout quicks
+--- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_codematch.pl
++++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_codematch.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ # Time-stamp: <2002-01-18 16:17:26 barre>
+ #
+ # Summary ?
+--- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_index.pl
++++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_index.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ # Time-stamp: <2001-11-21 17:40:48 barre>
+ #
+ # Build full-text index
+--- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_rmpath.pl
++++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_rmpath.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ # Time-stamp: <2001-10-05 11:49:40 barre>
+ #
+ # Remove path to intermediate Doxygen dir from html doc
+--- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_version.pl
++++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_version.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ # Time-stamp: <2006-11-15 13:25:02 barre>
+ #
+ # Extract VTK version and add it to documentation
diff --git a/debian/patches/libharu_version.patch b/debian/patches/libharu_version.patch
deleted file mode 100644 (file)
index 58104fb..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- vtk9 (9.0.1+dfsg1-1) UNRELEASED; urgency=medium
- .
-   [ Gert Wollny ]
-   * Initial release. (Closes: #XXXXXX)
- .
-   [ Drew Parsons ]
-   * Thanks: Nico Schloemer, Johannes Schauer and Gert for initial work
-     and python3 packaging.
-   * Drop deprecated patches:
-      10_allpatches.patch
-      40_use_system_sqlite.patch
-       - VTK_USE_SYSTEM_SQLITE now available
-      60_use_system_mpi4py.patch
-       - handled by VTK_USE_SYSTEM_MPI4PY
-      80_fix_arm_compilation.patch
-       - Qt5 now builds on arm
-      107_gl2ps_1.4.0.patch
-      109_use_parallel_hdf5.patch
-      111_search_multiarch_paths_for_libproj.patch
- .
-   [ Nico Schlömer ]
-   * Update to 8.2.0
-   * remove obsolete patches, configure options
-   * rework utf-8 patch
-   * Update standard to 4.4.1 (no changes)
-Author: Johannes Schauer <josch@debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2020-10-22
-
-Index: VTK-9.0.1/ThirdParty/libharu/CMakeLists.txt
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/libharu/CMakeLists.txt
-+++ VTK-9.0.1/ThirdParty/libharu/CMakeLists.txt
-@@ -1,14 +1,14 @@
- vtk_module_third_party(
-   INTERNAL
-     LICENSE_FILES "vtklibharu/LICENCE"
--    VERSION       "2.4.0"
-+    VERSION       "2.3.0"
-     STANDARD_INCLUDE_DIRS
-   EXTERNAL
-     PACKAGE LibHaru
-     # Unreleased. Requires these PRs:
-     # https://github.com/libharu/libharu/pull/157
-     # https://github.com/libharu/libharu/pull/187
--    VERSION 2.4.0
-+    VERSION 2.3.0
-     TARGETS LibHaru::LibHaru
-     STANDARD_INCLUDE_DIRS)
index a21fe5508c16f4d75d26dd416b1bdca5f0a0ad6e..289e829ad5e7da8aca6a6e16d348b3306b71691a 100644 (file)
@@ -1,4 +1,35 @@
 Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vtk9 (9.0.1+dfsg1-1) UNRELEASED; urgency=medium
+ .
+   [ Gert Wollny ]
+   * Initial release. (Closes: #XXXXXX)
+ .
+   [ Drew Parsons ]
+   * Thanks: Nico Schloemer, Johannes Schauer and Gert for initial work
+     and python3 packaging.
+   * Drop deprecated patches:
+      10_allpatches.patch
+      40_use_system_sqlite.patch
+       - VTK_USE_SYSTEM_SQLITE now available
+      60_use_system_mpi4py.patch
+       - handled by VTK_USE_SYSTEM_MPI4PY
+      80_fix_arm_compilation.patch
+       - Qt5 now builds on arm
+      107_gl2ps_1.4.0.patch
+      109_use_parallel_hdf5.patch
+      111_search_multiarch_paths_for_libproj.patch
+ .
+   [ Nico Schlömer ]
+   * Update to 8.2.0
+   * remove obsolete patches, configure options
+   * rework utf-8 patch
+   * Update standard to 4.4.1 (no changes)
 Author: Johannes Schauer <josch@debian.org>
 
 ---
@@ -50,35 +81,4 @@ Index: vtk9-9.0.1+dfsg1/Utilities/Python/CMakeLists.txt
 +      "python3/dist-packages")
    endif ()
  endif ()
-Index: vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt
-===================================================================
---- vtk9-9.0.1+dfsg1.orig/Wrapping/Python/CMakeLists.txt
-+++ vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt
-@@ -23,21 +23,21 @@ endif ()
- # The interpreters are not supported in wheel builds, so skip them.
- if (NOT VTK_WHEEL_BUILD)
--  add_executable(vtkpython
-+  add_executable(vtkpython-9.0
-     vtkpython.rc
-     vtkPythonAppInit.cxx)
--  target_link_libraries(vtkpython
-+  target_link_libraries(vtkpython-9.0
-     PRIVATE
-       VTK::WrappingPythonCore
-       VTK::PythonInterpreter
-       VTK::Python
-       VTK::vtkpythonmodules
-       VTK::vtksys)
--  add_executable(VTK::vtkpython ALIAS vtkpython)
-+  add_executable(VTK::vtkpython-9.0 ALIAS vtkpython-9.0)
-   if (VTK_INSTALL_PYTHON_EXES)
-     install(
--      TARGETS     vtkpython
--      EXPORT      VTKPython
-+      TARGETS     vtkpython-9.0
-+      EXPORT      VTK9Python
-       DESTINATION "${CMAKE_INSTALL_BINDIR}")
-   endif ()
  
index c9101d4f83e09995aa3081bc2aef3680e677d689..3fc5b6567d8c1d2c5542d7a9918386be64b6346b 100644 (file)
@@ -10,4 +10,6 @@
 #108_Doxygen-use-mathjax.patch
 110_do_not_link_against_socket.patch
 drop_medical_example.patch
+vtk9python
 pyth
+fix_path_perl.patch
diff --git a/debian/patches/vtk9python b/debian/patches/vtk9python
new file mode 100644 (file)
index 0000000..ad8566a
--- /dev/null
@@ -0,0 +1,78 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vtk9 (9.0.1+dfsg1-1) UNRELEASED; urgency=medium
+ .
+   [ Gert Wollny ]
+   * Initial release. (Closes: #XXXXXX)
+ .
+   [ Drew Parsons ]
+   * Thanks: Nico Schloemer, Johannes Schauer and Gert for initial work
+     and python3 packaging.
+   * Drop deprecated patches:
+      10_allpatches.patch
+      40_use_system_sqlite.patch
+       - VTK_USE_SYSTEM_SQLITE now available
+      60_use_system_mpi4py.patch
+       - handled by VTK_USE_SYSTEM_MPI4PY
+      80_fix_arm_compilation.patch
+       - Qt5 now builds on arm
+      107_gl2ps_1.4.0.patch
+      109_use_parallel_hdf5.patch
+      111_search_multiarch_paths_for_libproj.patch
+ .
+   [ Nico Schlömer ]
+   * Update to 8.2.0
+   * remove obsolete patches, configure options
+   * rework utf-8 patch
+   * Update standard to 4.4.1 (no changes)
+Author: Johannes Schauer <josch@debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2020-11-05
+
+Index: vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt
+===================================================================
+--- vtk9-9.0.1+dfsg1.orig/Wrapping/Python/CMakeLists.txt
++++ vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt
+@@ -23,21 +23,21 @@ endif ()
+ # The interpreters are not supported in wheel builds, so skip them.
+ if (NOT VTK_WHEEL_BUILD)
+-  add_executable(vtkpython
++  add_executable(vtkpython-9.0
+     vtkpython.rc
+     vtkPythonAppInit.cxx)
+-  target_link_libraries(vtkpython
++  target_link_libraries(vtkpython-9.0
+     PRIVATE
+       VTK::WrappingPythonCore
+       VTK::PythonInterpreter
+       VTK::Python
+       VTK::vtkpythonmodules
+       VTK::vtksys)
+-  add_executable(VTK::vtkpython ALIAS vtkpython)
++  add_executable(VTK::vtkpython-9.0 ALIAS vtkpython-9.0)
+   if (VTK_INSTALL_PYTHON_EXES)
+     install(
+-      TARGETS     vtkpython
+-      EXPORT      VTKPython
++      TARGETS     vtkpython-9.0
++      EXPORT      VTK9Python
+       DESTINATION "${CMAKE_INSTALL_BINDIR}")
+   endif ()
index 2aa0b58c99a8cf2b0304c3ecc8b1e0730cded259..e9cd718f4e1f784e985677f426954679dfe5da4e 100755 (executable)
@@ -48,12 +48,16 @@ extra_flags +=  \
        -DVTK_MODULE_USE_EXTERNAL_VTK_tiff:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_utf8:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_xdmf3:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion:BOOL=ON \
        -DVTK_PYTHON_VERSION:STRING=3 \
        -DVTK_EXTRA_COMPILER_WARNINGS=ON \
        -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
        -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed" \
-       -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed"
+       -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
+       -DVTK_MODULE_ENABLE_VTK_RenderingQt:STRING="YES" \
+        -DVTK_MODULE_ENABLE_VTK_RenderingTk:STRING="YES" \
+       -DVTK_MODULE_ENABLE_VTK_utf8:STRING="YES"
 
 override_dh_auto_configure:
 ifneq (,$(filter $(DEB_HOST_ARCH),$(noqt_archs)))
@@ -83,3 +87,10 @@ override_dh_auto_install:
        # Correct headers for paraview
        mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk9.jar
        sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.0/VTK-targets.cmake
+
+override_dh_install-arch:
+       dh_install -a
+       find $(CURDIR)/debian/libvtk9-dev/ -name "*Qt*" -exec rm {} \;
+       find $(CURDIR)/debian/libvtk9/ -name "*Qt*" -exec rm {} \;
+       find $(CURDIR)/debian/libvtk9-dev/usr/include/ -name "Q*" -exec rm {} \;
+       find $(CURDIR)/debian/libvtk9-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \;